; Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 17 Jan 2017 15:32:13 +0000 (07:32 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 17 Jan 2017 15:32:13 +0000 (07:32 -0800)
The following commit was skipped:

8dd624c Document that functions in 'ffap-alist' can use the match data


Trivial merge